Fixed multilib install paths for libpri-1.2.5 and marked it stable on amd64

(Portage version: 2.1.3.3)

3 files changed, 62 insertions, 4 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index d94022ecb8e1..c2d3b5a3f99c 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpri
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.67 2007/07/17 19:45:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.68 2007/08/06 20:20:22 angelos Exp $
+
+  06 Aug 2007; Christoph Mende <angelos@gentoo.org>
+  +files/libpri-1.2.5-multilib.patch, libpri-1.2.5.ebuild:
+  Fixed multilib install paths for libpri-1.2.5 and marked it stable on amd64
 
   17 Jul 2007; Christian Faulhammer <opfer@gentoo.org> libpri-1.2.5.ebuild:
   stable x86, security bug 171884
diff --git a/net-libs/libpri/files/libpri-1.2.5-multilib.patch b/net-libs/libpri/files/libpri-1.2.5-multilib.patch
new file mode 100644
index 000000000000..b3654f2e8dad
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.5-multilib.patch
@@ -0,0 +1,53 @@
+diff -Nru libpri-1.2.5.orig/Makefile libpri-1.2.5/Makefile
+--- libpri-1.2.5.orig/Makefile	2007-08-06 22:04:41.000000000 +0200
++++ libpri-1.2.5/Makefile	2007-08-06 22:02:37.000000000 +0200
+@@ -41,6 +41,7 @@
+ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ SOFLAGS = -Wl,-hlibpri.so.1.0
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
+@@ -73,28 +74,28 @@
+ 	fi
+ 
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
++	mkdir -p $(LIBDIR)
+ 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+ 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
++	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
++	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
++	( cd $(LIBDIR) ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
++	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
++	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
+-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
+-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
++	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++	( cd $(LIBDIR) ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
++	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+ 
+ uninstall:
+ 	@echo "Removing Libpri"
+-	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1.0
+-	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1
+-	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
+-	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
++	rm -f $(LIBDIR)/libpri.so.1.0
++	rm -f $(LIBDIR)/libpri.so.1
++	rm -f $(LIBDIR)/libpri.so
++	rm -f $(LIBDIR)/libpri.a
+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+ 
+ pritest: pritest.o
diff --git a/net-libs/libpri/libpri-1.2.5.ebuild b/net-libs/libpri/libpri-1.2.5.ebuild
index 92a875459939..b857ae538c1f 100644
--- a/net-libs/libpri/libpri-1.2.5.ebuild
+++ b/net-libs/libpri/libpri-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.3 2007/07/17 19:45:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.4 2007/08/06 20:20:22 angelos Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="virtual/libc"
 
@@ -31,6 +31,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.2.5-gentoo.diff
+	epatch ${FILESDIR}/${P}-multilib.patch
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
@@ -50,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX=${D} LIBDIR="${D}/usr/$(get_libdir)" install || die
 
 	dodoc ChangeLog README TODO LICENSE
 }