new upstream release

(Portage version: 2.0.51.22-r1)

10 files changed, 55 insertions, 89 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 015ac5439913..ec13e82e07d5 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2005/05/13 00:37:16 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.34 2005/06/25 23:31:22 pebenito Exp $
+
+*libselinux-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org> -libselinux-1.20.ebuild,
+  -libselinux-1.22.ebuild, +libselinux-1.24.ebuild:
+  New upstream release.
 
   13 May 2005; Chris PeBenito <pebenito@gentoo.org>
   libselinux-1.22-r1.ebuild:
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.20 b/sys-libs/libselinux/files/digest-libselinux-1.20
deleted file mode 100644
index 52222a7ea0b6..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a33e6010f8e1a22c5d1c013dc6bf893a libselinux-1.20.tgz 76853
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.22 b/sys-libs/libselinux/files/digest-libselinux-1.22
deleted file mode 100644
index cc35c44f474d..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43b7640652d1fd85e6ab3df9b873ddd3 libselinux-1.22.tgz 81142
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.24 b/sys-libs/libselinux/files/digest-libselinux-1.24
new file mode 100644
index 000000000000..89def6cd5e2d
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.24
@@ -0,0 +1 @@
+MD5 319679755cdd2c8843c596c0631b7afd libselinux-1.24.tgz 87689
diff --git a/sys-libs/libselinux/libselinux-1.20.ebuild b/sys-libs/libselinux/libselinux-1.20.ebuild
deleted file mode 100644
index f75cf6af94bd..000000000000
--- a/sys-libs/libselinux/libselinux-1.20.ebuild
+++ /dev/null
@@ -1,42 +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.20.ebuild,v 1.2 2005/02/14 00:26:36 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."
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-libs/libselinux/libselinux-1.24.ebuild b/sys-libs/libselinux/libselinux-1.24.ebuild
new file mode 100644
index 000000000000..57a4376bdaf6
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-1.24.ebuild
@@ -0,0 +1,41 @@
+# 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.24.ebuild,v 1.1 2005/06/25 23:31:22 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 ~mips"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# make portage CFLAGS work
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/src/Makefile \
+		|| die "src Makefile CFLAGS fix failed."
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/utils/Makefile \
+		|| die "utils Makefile CFLAGS fix failed."
+
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" ${S}/src/Makefile \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" ${S}/src/Makefile \
+		|| die "Fix for multilib SHLIBDIR failed."
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}
diff --git a/sys-libs/libsepol/files/digest-libsepol-1.2 b/sys-libs/libsepol/files/digest-libsepol-1.2
deleted file mode 100644
index 4735acc16913..000000000000
--- a/sys-libs/libsepol/files/digest-libsepol-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54e2052452d5247b944252652ed94594 libsepol-1.2.tgz 56595
diff --git a/sys-libs/libsepol/files/digest-libsepol-1.6 b/sys-libs/libsepol/files/digest-libsepol-1.6
new file mode 100644
index 000000000000..ce6f73a35a71
--- /dev/null
+++ b/sys-libs/libsepol/files/digest-libsepol-1.6
@@ -0,0 +1 @@
+MD5 d4681092a9c93c4145455e712a7c6cf6 libsepol-1.6.tgz 68562
diff --git a/sys-libs/libsepol/libsepol-1.2.ebuild b/sys-libs/libsepol/libsepol-1.2.ebuild
deleted file mode 100644
index afa5913d21b9..000000000000
--- a/sys-libs/libsepol/libsepol-1.2.ebuild
+++ /dev/null
@@ -1,38 +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/libsepol/libsepol-1.2.ebuild,v 1.3 2005/01/08 03:08:33 pebenito Exp $
-
-IUSE="mls"
-
-DESCRIPTION="SELinux binary policy management library"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	if use mls; then
-		sed -i -e '/^MLS/s/n/y/' src/Makefile \
-			|| die "MLS option failed."
-	fi
-
-	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."
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-libs/libselinux/libselinux-1.22.ebuild b/sys-libs/libsepol/libsepol-1.6.ebuild
index 3fd62f305906..cb227fe99385 100644
--- a/sys-libs/libselinux/libselinux-1.22.ebuild
+++ b/sys-libs/libsepol/libsepol-1.6.ebuild
@@ -1,17 +1,17 @@
 # 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.22.ebuild,v 1.4 2005/05/10 18:23:40 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.6.ebuild,v 1.1 2005/06/25 23:33:57 pebenito Exp $
 
 IUSE=""
 
-inherit eutils multilib
+inherit multilib
 
-DESCRIPTION="SELinux userland library"
+DESCRIPTION="SELinux binary policy management library"
 HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="public-domain"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 mips"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
 DEPEND="virtual/libc"