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

Package-Manager: portage-2.1.3.3

4 files changed, 78 insertions, 16 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/Manifest b/net-libs/libpri/Manifest
index 32e017f2d416..deb15f76bc35 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -13,6 +13,10 @@ AUX libpri-1.2.5-gentoo.diff 1244 RMD160 38821ad5d9fc89ddf2d207ddd0e2d818b7174ac
 MD5 d3abe2893d6dc4b2aae91ecf9e7fd26c files/libpri-1.2.5-gentoo.diff 1244
 RMD160 38821ad5d9fc89ddf2d207ddd0e2d818b7174acb files/libpri-1.2.5-gentoo.diff 1244
 SHA256 a8bd018ccbf6670dff74daa568bacc1c5772caafc2ef4e8779d9d89ba99bf098 files/libpri-1.2.5-gentoo.diff 1244
+AUX libpri-1.2.5-multilib.patch 2703 RMD160 a390cd241bb7bea56a6f78c91415826f00ab3fc2 SHA1 371a859d75b759b995410af1c377a8d80dc0f45f SHA256 7e045f6499c54d0242b421e2d71f0ccb7a6b20c30a0f82dd7cf8281ac9dded89
+MD5 34fd172b2a62ab2d4a216d39f2946e59 files/libpri-1.2.5-multilib.patch 2703
+RMD160 a390cd241bb7bea56a6f78c91415826f00ab3fc2 files/libpri-1.2.5-multilib.patch 2703
+SHA256 7e045f6499c54d0242b421e2d71f0ccb7a6b20c30a0f82dd7cf8281ac9dded89 files/libpri-1.2.5-multilib.patch 2703
 DIST bristuff-0.2.0-RC8g.tar.gz 139013 RMD160 c0a037e0819b8985be2df60a010309335527f203 SHA1 d4289553e12260a24814b045c26a77c087e39daf SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b
 DIST bristuff-0.2.0-RC8h.tar.gz 150270 RMD160 a958bc8418618ca892f0fbdb8d8cf203375d3865 SHA1 93420f41e6383167505f5ef8b65cde7ddf7f42ea SHA256 74c2e40cd665a2a9ac29d5ddd31892c8ca15ca9b55e2a08523e9db5ca75ba207
 DIST bristuff-0.2.0-RC8q.tar.gz 152037 RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 SHA1 27a6f56f47aa7ee5459d2625da7cff310909764e SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728
@@ -71,14 +75,14 @@ EBUILD libpri-1.2.4.ebuild 1318 RMD160 ebd4f377dc64683dcd704f2de41ededc79fdcd6f
 MD5 233bee5aa374554f4a31a32131d440e4 libpri-1.2.4.ebuild 1318
 RMD160 ebd4f377dc64683dcd704f2de41ededc79fdcd6f libpri-1.2.4.ebuild 1318
 SHA256 c021253bcde49bb57d1df30bf1f95544bc99487c8b3b2fd91693757059442bf8 libpri-1.2.4.ebuild 1318
-EBUILD libpri-1.2.5.ebuild 1315 RMD160 251bdf9ceb86f1b305a31bccb889faa5cc0d3265 SHA1 d33333292164e5ed0ca0fd376950511f82e2711c SHA256 dca32b3b4acd94bdb6b49a0ccdf1c4bab9e85ee95b6f45a86ee0e97a67d37180
-MD5 9f65c1f260188cde8ba9dff04f7b88db libpri-1.2.5.ebuild 1315
-RMD160 251bdf9ceb86f1b305a31bccb889faa5cc0d3265 libpri-1.2.5.ebuild 1315
-SHA256 dca32b3b4acd94bdb6b49a0ccdf1c4bab9e85ee95b6f45a86ee0e97a67d37180 libpri-1.2.5.ebuild 1315
-MISC ChangeLog 8780 RMD160 5eba05b462573fffc5382e3d5bae719895f337f8 SHA1 693d7b962e9b1b9c3757d54be72afc6adfe43b09 SHA256 e95f42719e31c6da0c3ff9e6e01568a3d62b9e76243a049a569809111e290530
-MD5 b57e22dc2a7855e759886dddc872423a ChangeLog 8780
-RMD160 5eba05b462573fffc5382e3d5bae719895f337f8 ChangeLog 8780
-SHA256 e95f42719e31c6da0c3ff9e6e01568a3d62b9e76243a049a569809111e290530 ChangeLog 8780
+EBUILD libpri-1.2.5.ebuild 1388 RMD160 5dcee450d974e492c2ee9b54f1f7eb65c34a35f5 SHA1 42a15fb4ee42b8998bc982b3df074107336d869b SHA256 a673c35686d79d82090f66948175fa282d9aa42f0545c5cd59d65f67ac685e45
+MD5 e1227c932c0a42935b1afd1d19b4284d libpri-1.2.5.ebuild 1388
+RMD160 5dcee450d974e492c2ee9b54f1f7eb65c34a35f5 libpri-1.2.5.ebuild 1388
+SHA256 a673c35686d79d82090f66948175fa282d9aa42f0545c5cd59d65f67ac685e45 libpri-1.2.5.ebuild 1388
+MISC ChangeLog 8972 RMD160 e0464af45e78fffb2b49b31451aa86ae197083ce SHA1 9abce31f4c1109281818662edbcf5494ecd3a017 SHA256 ed26e1bfa98a12278cf31945a60616927e5da32316e3c5a949abedb9b4b48e07
+MD5 250f2be14824d07c58c9250ac46fc7e4 ChangeLog 8972
+RMD160 e0464af45e78fffb2b49b31451aa86ae197083ce ChangeLog 8972
+SHA256 ed26e1bfa98a12278cf31945a60616927e5da32316e3c5a949abedb9b4b48e07 ChangeLog 8972
 MISC metadata.xml 248 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e SHA1 10bea6cd152e9f0ecb627eaacc19980a9d5f5dc4 SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e metadata.xml 248
@@ -117,9 +121,9 @@ MD5 547b09fb2a90c52e8a7faeb855092140 files/digest-libpri-1.2.5 506
 RMD160 962b74872ede8c00a2bb07ba6108aae8a89317fc files/digest-libpri-1.2.5 506
 SHA256 dbfb73021a0d71d31b041c32fbc8bd02b28b0e41138273d8eedf465ef9d8ad53 files/digest-libpri-1.2.5 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGnRxANQqtfCuFneMRAlD5AKCMSO2ip59jN4CxPVQn0OxbxregvgCeIeMC
-xFojVnuIO9jREJphJd1LhNA=
-=mO05
+iD8DBQFGt4KOKhnDs22gwa8RAh+WAKDqSWmd4Ve5eItMVn6EEtgYTRKyxQCgrD4c
+ObqM+isOERY/A8slWceURkw=
+=j1Si
 -----END PGP SIGNATURE-----
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
 }