7 files changed, 18 insertions, 73 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 3ad5131f23ed..59a6e6c774a6 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.27 2005/02/14 00:26:35 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.28 2005/03/13 13:34:56 pebenito Exp $
+
+*libselinux-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.22.ebuild:
+  New upstream release.
 
   13 Feb 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.20.ebuild:
   Mark stable.
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.16 b/sys-libs/libselinux/files/digest-libselinux-1.16
deleted file mode 100644
index dddb822c141b..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0dfa39b41834904e58db14ddb881abb9 libselinux-1.16.tgz 64612
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.18 b/sys-libs/libselinux/files/digest-libselinux-1.18
deleted file mode 100644
index f467fcc5581b..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2de56f8b585dd1db0d4d5c64d56161d4 libselinux-1.18.tgz 69288
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.22 b/sys-libs/libselinux/files/digest-libselinux-1.22
new file mode 100644
index 000000000000..cc35c44f474d
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.22
@@ -0,0 +1 @@
+MD5 43b7640652d1fd85e6ab3df9b873ddd3 libselinux-1.22.tgz 81142
diff --git a/sys-libs/libselinux/files/selinuxconfig.c.diff b/sys-libs/libselinux/files/selinuxconfig.c.diff
deleted file mode 100644
index eb29cae0497e..000000000000
--- a/sys-libs/libselinux/files/selinuxconfig.c.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: utils/selinuxconfig.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/libselinux/utils/selinuxconfig.c,v
-retrieving revision 1.2
-diff -u -r1.2 selinuxconfig.c
---- utils/selinuxconfig.c	15 Jun 2004 13:16:30 -0000	1.2
-+++ utils/selinuxconfig.c	10 Nov 2004 01:04:41 -0000
-@@ -28,6 +28,7 @@
- 	printf("binary_policy_path=\"%s\"\n", selinux_binary_policy_path());
- 	printf("user_contexts_path=\"%s\"\n", selinux_user_contexts_path());
- 	printf("contexts_path=\"%s\"\n", selinux_contexts_path());
-+	printf("file_contexts_path=\"%s\"\n", selinux_file_context_path());
- 	exit(0);
- 
- }
diff --git a/sys-libs/libselinux/libselinux-1.18.ebuild b/sys-libs/libselinux/libselinux-1.18.ebuild
deleted file mode 100644
index d9e79f72828e..000000000000
--- a/sys-libs/libselinux/libselinux-1.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.18.ebuild,v 1.3 2005/01/08 03:04:43 pebenito Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	# add for compatibility, for now.  Otherwise the current sysvinit
-	# patch fails to compile.
-	sed -i -e 's/^\#endif//' ${S}/include/selinux/selinux.h
-	echo '/* so older sysvinit patch can compile */' >> ${S}/include/selinux/selinux.h
-	echo '#define SELINUXMNT "/selinux/"' >> ${S}/include/selinux/selinux.h
-	echo '#define SELINUXPOLICY "/etc/security/selinux/policy"' >> ${S}/include/selinux/selinux.h
-	echo '#endif' >> ${S}/include/selinux/selinux.h
-
-	cd ${S}
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" src/Makefile \
-		|| die "src Makefile CFLAGS fix failed."
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \
-		|| die "utils Makefile CFLAGS fix failed."
-
-	epatch ${FILESDIR}/selinuxconfig.c.diff
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-libs/libselinux/libselinux-1.16.ebuild b/sys-libs/libselinux/libselinux-1.22.ebuild
index 33fc78b98968..9c716352566b 100644
--- a/sys-libs/libselinux/libselinux-1.16.ebuild
+++ b/sys-libs/libselinux/libselinux-1.22.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.16.ebuild,v 1.4 2005/01/04 00:55:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.22.ebuild,v 1.1 2005/03/13 13:34:56 pebenito Exp $
 
 IUSE=""
 
+inherit eutils multilib
+
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-
-	# add for compatibility, for now.  Otherwise the current sysvinit
-	# patch fails to compile.
-	sed -i -e 's/^\#endif//' ${S}/include/selinux/selinux.h
-	echo '/* so older sysvinit patch can compile */' >> ${S}/include/selinux/selinux.h
-	echo '#define SELINUXMNT "/selinux/"' >> ${S}/include/selinux/selinux.h
-	echo '#define SELINUXPOLICY "/etc/security/selinux/policy"' >> ${S}/include/selinux/selinux.h
-	echo '#endif' >> ${S}/include/selinux/selinux.h
-
 	cd ${S}
+
 	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" src/Makefile \
 		|| die "src Makefile CFLAGS fix failed."
 	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \
 		|| die "utils Makefile CFLAGS fix failed."
+
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib SHLIBDIR failed."
 }
 
 src_compile() {