fix multilib issue

Package-Manager: portage-2.0.51.22-r3

3 files changed, 24 insertions, 31 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index d0c5d57210f9..f4bc707287bc 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.60 2005/08/23 21:53:35 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.61 2005/11/24 16:50:10 blubb Exp $
+
+  24 Nov 2005; Simon Stelling <blubb@gentoo.org> jabberd-1.4.3-r5.ebuild:
+  fix multilib issue; bug 113472
 
   23 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
   jabberd-1.4.3-r5.ebuild, jabberd-2.0.9.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index a2f48c9d2e76..f1dfd973497e 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 83c97a3de0a570a5792290adf653fe07 jabberd-1.4.3-r5.ebuild 5808
-MD5 95d2d330856a7b80ead26d0c334d5571 jabberd-2.0.9.ebuild 3621
+MD5 a40cc4041838ca023189d757bcfc83b4 ChangeLog 9900
 MD5 1de04ab5d7e18332a5d73790aadf336f jabberd-1.4.3-r4.ebuild 5813
-MD5 4b98113bcadc3fff9bcdccb47a9932b0 ChangeLog 9795
+MD5 95d2d330856a7b80ead26d0c334d5571 jabberd-2.0.9.ebuild 3621
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
-MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
+MD5 798d2dd93ed39fc9c20919226a8d51b1 jabberd-1.4.3-r5.ebuild 5844
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
-MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
-MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
-MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
-MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
-MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
-MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
 MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
-MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
-MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
-MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
 MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
+MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
 MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
 MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
 MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
+MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
+MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
+MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
+MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
+MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
+MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
+MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
+MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC5rx8zY1VwezZiERAqR6AKCXZEJ3sFDK48F55Am4TH/XR9euWACggkXb
-TxQhYqQUQBviR1u2ZVr594k=
-=QPpm
------END PGP SIGNATURE-----
diff --git a/net-im/jabberd/jabberd-1.4.3-r5.ebuild b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
index 22d92e21f94a..f33742dc1da3 100644
--- a/net-im/jabberd/jabberd-1.4.3-r5.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.4 2005/08/23 21:53:35 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.5 2005/11/24 16:50:10 blubb Exp $
 
-inherit eutils
+inherit eutils multilib
 
 S="${WORKDIR}/jabberd-${PV}"
 DESCRIPTION="Open Source Jabber Server"
@@ -72,7 +72,7 @@ src_compile() {
 src_install() {
 	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
 	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r8 jabber
-	dodir /usr/sbin /etc/jabber /usr/lib/jabberd /var/log/jabber /usr/include/jabberd
+	dodir /usr/sbin /etc/jabber /usr/$(get_libdir)/jabberd /var/log/jabber /usr/include/jabberd
 	touch ${D}/var/log/jabber/error.log
 	touch ${D}/var/log/jabber/record.log
 	dodir /var/spool/jabber
@@ -82,7 +82,7 @@ src_install() {
 
 	exeinto /usr/sbin
 	doexe jabberd/jabberd
-	insinto /usr/lib/jabberd
+	insinto /usr/$(get_libdir)/jabberd
 	doins platform-settings
 	doins jsm/jsm.so
 	doins xdb_file/xdb_file.so
@@ -94,7 +94,7 @@ src_install() {
 		doins xdb_ldap/jabber.schema
 		doins xdb_ldap/slapd.conf
 		doins config/xdb-ldap.xml
-		insinto /usr/lib/jabberd
+		insinto /usr/$(get_libdir)/jabberd
 		doins xdb_ldap/src/xdb_ldap.so
 	fi
 	insinto /etc/jabber