summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-11-24 16:50:10 +0000
committerSimon Stelling <blubb@gentoo.org>2005-11-24 16:50:10 +0000
commit18bb992fe9f0fe0893f9f03c5f6d22def97a494c (patch)
tree682f23cea1fc43a2a36536a410543fe9503241ff /net-im/jabberd
parentv5 -amd64 as clean install does not work (diff)
downloadgentoo-2-18bb992fe9f0fe0893f9f03c5f6d22def97a494c.tar.gz
gentoo-2-18bb992fe9f0fe0893f9f03c5f6d22def97a494c.tar.bz2
gentoo-2-18bb992fe9f0fe0893f9f03c5f6d22def97a494c.zip
fix multilib issue
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'net-im/jabberd')
-rw-r--r--net-im/jabberd/ChangeLog5
-rw-r--r--net-im/jabberd/jabberd-1.4.3-r5.ebuild10
2 files changed, 9 insertions, 6 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/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