fix to make non-X really work

4 files changed, 64 insertions, 4 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 1ec77300d66d..f86ffc8d14d2 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.6 2003/12/22 20:15:02 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.7 2003/12/23 02:07:14 pebenito Exp $
+
+  22 Dec 2003; Chris PeBenito <pebenito@gentoo.org> setools-1.1.ebuild,
+  files/setools-1.1-fix_noX.diff:
+  Treesys makefiles are broken. Add a hack to make it really work for non X
+  systems.
 
 *setools-1.1 (22 Dec 2003)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 6bed44cf9a97..b65e905db00d 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,7 @@
 MD5 8fb317db54d945003dde0f10ae0f84a5 setools-1.0.1.ebuild 2164
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
-MD5 61c14d4efc4967fd3f55f270ad7a52de ChangeLog 1048
-MD5 acfcfe6d3319bdc75f971a403cfeb8a9 setools-1.1.ebuild 3074
+MD5 ecd32fdee496ebce4c002e60b4d75967 ChangeLog 1242
+MD5 d0331678fec0f8d01ee896611868c627 setools-1.1.ebuild 3203
 MD5 5564aa4a7b6c1f09a6b07813defbedd5 files/digest-setools-1.0.1 62
+MD5 a8fb0b7e830355d9de617df14ceaf43b files/setools-1.1-fix_noX.diff 1328
 MD5 471bf4cba5a334dcb65b4451a1b0ce07 files/digest-setools-1.1 60
diff --git a/app-admin/setools/files/setools-1.1-fix_noX.diff b/app-admin/setools/files/setools-1.1-fix_noX.diff
new file mode 100644
index 000000000000..22cb78179843
--- /dev/null
+++ b/app-admin/setools/files/setools-1.1-fix_noX.diff
@@ -0,0 +1,50 @@
+diff -urN setools-1.1.orig/libapol/Makefile setools-1.1/libapol/Makefile
+--- setools-1.1.orig/libapol/Makefile	2003-11-05 08:55:44.000000000 -0600
++++ setools-1.1/libapol/Makefile	2003-12-22 19:58:01.000000000 -0600
+@@ -3,21 +3,14 @@
+ LIB-OBJ	= policy.o policy-query.o policy-io.o queue.o util.o clone.o 
+ LIB-OBJ += y.tab.o lex.yy.o avl-util.o policy-avl.o render.o analysis.o 
+ LIB-OBJ += perm-map.o cond.o 
+-LIB-OBJ-TCL = apol_tcl.o
+ 
+ 
+ libapol: ../lib/libapol.a
+ 
+-libapol-tcl: ../lib/libapol-tcl.a
+-
+-
+ ../lib/libapol.a: ../lib $(LIB-OBJ) 
+ 	 ar cr $@ $(LIB-OBJ) 
+ 
+ 
+-../lib/libapol-tcl.a: ../lib $(LIB-OBJ-TCL) 
+-	 ar cr $@ $(LIB-OBJ-TCL) 
+-
+ %.o:  %.c 
+ 	$(CC) $(CFLAGS) -c $<
+ 
+diff -urN setools-1.1.orig/libseuser/Makefile setools-1.1/libseuser/Makefile
+--- setools-1.1.orig/libseuser/Makefile	2003-10-10 13:23:23.000000000 -0500
++++ setools-1.1/libseuser/Makefile	2003-12-22 19:58:24.000000000 -0600
+@@ -1,20 +1,14 @@
+ # libseuser and libseuser-tcl
+ 
+-LIB-OBJ		= seuser_tcl.o seuser_db.o 
+-LIB-OBJ-TCL = $(LIB-OBJ) seuser_tcl.o
++LIB-OBJ		= seuser_db.o 
+ 
+ 
+ 
+ libseuser: ../lib/libseuser.a
+ 
+-libseuser-tcl: ../lib/libseuser-tcl.a
+-
+ ../lib/libseuser.a: ../lib $(LIB-OBJ) 
+ 	 ar cr $@ $(LIB-OBJ) 
+ 	 
+-../lib/libseuser-tcl.a: ../lib $(LIB-OBJ-TCL) 
+-	 ar cr $@ $(LIB-OBJ-TCL)
+-
+ %.o:  %.c 
+ 	$(CC) $(CFLAGS) -c $<
+ 
diff --git a/app-admin/setools/setools-1.1.ebuild b/app-admin/setools/setools-1.1.ebuild
index dd2354659e08..9fc6d6793ae2 100644
--- a/app-admin/setools/setools-1.1.ebuild
+++ b/app-admin/setools/setools-1.1.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/app-admin/setools/setools-1.1.ebuild,v 1.1 2003/12/22 20:15:02 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.1.ebuild,v 1.2 2003/12/23 02:07:14 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -29,6 +29,7 @@ has_version '>=dev-lang/tk-8.4' \
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
 	# fix the Makefile to listen to portage CFLAGS
 	sed -i -e "s:-O2:-O2 ${CFLAGS}:" ${S}/Makefile
@@ -43,6 +44,9 @@ src_unpack() {
 
 	# fix up the file contexts
 	sed -i -e 's:local/selinux/::' -e 's:local/::' ${S}/policy/seuser.fc
+
+	# makefiles are broken, fix to not build tcl/tk stuff for non X
+	use X || epatch ${FILESDIR}/setools-1.1-fix_noX.diff
 }
 
 src_compile() {