Move libraries to /lib, to fix problems with having a separate /usr during booting.

8 files changed, 25 insertions, 61 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 88795cfd1178..fd602de5c208 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.9 2003/10/03 16:39:46 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.10 2003/10/07 18:16:23 pebenito Exp $
+
+*libselinux-1.2-r1 (07 Oct 2003)
+
+  07 Oct 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.2-r1.ebuild,
+  files/libselinux-1.2-gentoo.diff:
+  Move libraries to /lib, to fix problems with having a separate /usr during
+  booting.
 
 *libselinux-1.2 (03 Oct 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index b36ebc566c46..58a98b3fd5b2 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,9 +1,6 @@
-MD5 93ae22ff3961818903bb4da511f15cc3 libselinux-1.2.ebuild 843
+MD5 8c139a18d3ec058c9c704758d1b990e9 libselinux-1.2-r1.ebuild 844
 MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
-MD5 a970390dd067f3f2a60f4a7fc79f9fc6 ChangeLog 1730
-MD5 63cfcf5b8cfd21a5caba0527082f513a libselinux-1.1-r1.ebuild 826
-MD5 ed35b412c4b957fe6121ea3d8d0a01ac files/digest-libselinux-1.2 62
+MD5 be0d42c6d14e38275e47d80f4e73cab1 ChangeLog 1968
 MD5 740bc8d55ebd8f695dd659ef63aef072 files/libselinux-1.2-const.diff 5020
-MD5 ee2480e816c5fb6bdc78e94cf0a4d1f5 files/libselinux-1.1-gentoo.diff 1242
-MD5 4276fc22ccd5de38cc3ce45f83343f68 files/digest-libselinux-1.1-r1 62
-MD5 9fbf39a4f64f805072e80f9a38d0c56f files/libselinux-1.1-linkfix.diff 430
+MD5 ed35b412c4b957fe6121ea3d8d0a01ac files/digest-libselinux-1.2-r1 62
+MD5 ef5854592774ac33f6427e1d8651edf8 files/libselinux-1.2-gentoo.diff 1591
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.1-r1 b/sys-libs/libselinux/files/digest-libselinux-1.1-r1
deleted file mode 100644
index fa57db84994f..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7460cc9e6590cafdda7f35eeabbd03fb libselinux-1.1.tgz 22733
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.2 b/sys-libs/libselinux/files/digest-libselinux-1.2-r1
index 32663d6490ab..32663d6490ab 100644
--- a/sys-libs/libselinux/files/digest-libselinux-1.2
+++ b/sys-libs/libselinux/files/digest-libselinux-1.2-r1
diff --git a/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff b/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff
deleted file mode 100644
index 85717b942032..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libselinux-1.1.orig/src/Makefile libselinux-1.1/src/Makefile
---- libselinux-1.1.orig/src/Makefile	2003-08-14 16:34:07.000000000 -0500
-+++ libselinux-1.1/src/Makefile	2003-08-14 16:35:14.000000000 -0500
-@@ -19,7 +19,7 @@
- 	ranlib $@
- 
- $(LIBSO): $(OBJS)
--	$(CC) $(LDFLAGS) -shared -o $@ $^ -lc -Wl,-soname,$(LIBSO) 
-+	$(CC) $(LDFLAGS) -shared -o $@ $^ -lattr -lc -Wl,-soname,$(LIBSO) 
- 	ln -sf $@ $(TARGET) 
- 
- %.o:  %.c
diff --git a/sys-libs/libselinux/files/libselinux-1.1-gentoo.diff b/sys-libs/libselinux/files/libselinux-1.2-gentoo.diff
index 5685fa0273ae..3018120c66dd 100644
--- a/sys-libs/libselinux/files/libselinux-1.1-gentoo.diff
+++ b/sys-libs/libselinux/files/libselinux-1.2-gentoo.diff
@@ -34,3 +34,13 @@ diff -urN libselinux-1.0.orig/utils/Makefile libselinux-1.0/utils/Makefile
  override CFLAGS += -I../include
  LDLIBS += -L../src -lselinux -lattr
  
+diff -urN libselinux-1.2.orig/src/Makefile libselinux-1.2/src/Makefile
+--- libselinux-1.2.orig/src/Makefile	2003-08-27 10:36:19.000000000 -0500
++++ libselinux-1.2/src/Makefile	2003-10-06 11:38:38.000000000 -0500
+@@ -1,5 +1,5 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
++PREFIX ?= $(DESTDIR)/
+ LIBDIR ?= $(PREFIX)/lib
+ 
+ LIBVERSION = 1
diff --git a/sys-libs/libselinux/libselinux-1.1-r1.ebuild b/sys-libs/libselinux/libselinux-1.1-r1.ebuild
deleted file mode 100644
index fa054ebfd721..000000000000
--- a/sys-libs/libselinux/libselinux-1.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.1-r1.ebuild,v 1.5 2003/09/27 19:10:55 pebenito Exp $
-
-IUSE=""
-
-DESCRIPTION="SELinux library (libselinux)"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND="sys-apps/attr"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-linkfix.diff
-}
-
-src_compile() {
-	cd ${S}/src
-	emake EXTRA_CFLAGS="${CFLAGS}" || die "libselinux compile failed."
-
-	cd ${S}/utils
-	emake EXTRA_CFLAGS="${CFLAGS}" || die "Utilities compile failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
diff --git a/sys-libs/libselinux/libselinux-1.2.ebuild b/sys-libs/libselinux/libselinux-1.2-r1.ebuild
index b0f208bcf47f..69bcde863375 100644
--- a/sys-libs/libselinux/libselinux-1.2.ebuild
+++ b/sys-libs/libselinux/libselinux-1.2-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-libs/libselinux/libselinux-1.2.ebuild,v 1.1 2003/10/03 16:39:46 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.2-r1.ebuild,v 1.1 2003/10/07 18:16:23 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="sys-apps/attr"
 
@@ -19,7 +19,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/libselinux-1.1-gentoo.diff
+	epatch ${FILESDIR}/libselinux-1.2-gentoo.diff
 	epatch ${FILESDIR}/libselinux-1.2-const.diff
 }