diff options
| author |   Bart Verwilst <verwilst@gentoo.org> | 2002-11-13 20:35:12 +0000 |
|---|---|---|
| committer | Bart Verwilst <verwilst@gentoo.org> | 2002-11-13 20:35:12 +0000 |
| commit | 6378972d54cf36e92dab2bd1dc2a20f2ea1acc43 (patch) | |
| tree | 8cf2eed01498d508831e2545fae7b497b9674ebd /net-im/jabber-server | |
| parent | cvs xfree (diff) | |
| download | historical-6378972d54cf36e92dab2bd1dc2a20f2ea1acc43.tar.gz historical-6378972d54cf36e92dab2bd1dc2a20f2ea1acc43.tar.bz2 historical-6378972d54cf36e92dab2bd1dc2a20f2ea1acc43.zip | |
final fix0rs for tonight.. it compiles..
Diffstat (limited to 'net-im/jabber-server')
| -rw-r--r-- | net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 | 2 | ||||
| -rw-r--r-- | net-im/jabber-server/files/hash_map_gcc32.patch | 10 | ||||
| -rw-r--r-- | net-im/jabber-server/jabber-server-1.4.2-r2.ebuild | 20 |
3 files changed, 25 insertions, 7 deletions
diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 index 0f5ee04ebe85..d246b58dec15 100644 --- a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 +++ b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 @@ -4,4 +4,4 @@ MD5 7cff38bc6f2b0adae9e942cffa1b5b70 msn-transport-stable-20011217.tar.gz 33781 MD5 565c259b23ac27ead83a97c3c7daa3b5 yahoo-t-2.1.1.tar.gz 35742 MD5 3946cf625278fb5899cad78d49f469d4 Install_AIM_3.5.1670.exe 2452872 MD5 3217d8026cea7e65b6e4afc394c79921 muconference-0.3.tar.gz 35358 -MD5 b1e5ae96a6892bc8106bed6c40387d73 icqv7-t-0.2.9.5.tar.gz 502552 +MD5 243afa234a6dcea2f3ed1d5a740fab7f icqv7-t-0.3.0pre2.tar.gz 416517 diff --git a/net-im/jabber-server/files/hash_map_gcc32.patch b/net-im/jabber-server/files/hash_map_gcc32.patch new file mode 100644 index 000000000000..6e1d2346008b --- /dev/null +++ b/net-im/jabber-server/files/hash_map_gcc32.patch @@ -0,0 +1,10 @@ +--- icqv7-t-0.3.0pre2/MySocketWatcher.h.orig 2002-11-13 21:02:41.000000000 +0100 ++++ icqv7-t-0.3.0pre2/MySocketWatcher.h 2002-11-13 21:03:13.000000000 +0100 +@@ -59,6 +59,7 @@ + using namespace bedrock; + using namespace std; + using namespace bedrock::net; ++using namespace __gnu_cxx; + + class it_Client; + class MySocketWatcher { diff --git a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild index df5a769bf075..276621e952bb 100644 --- a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild +++ b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.6 2002/11/13 18:22:16 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.7 2002/11/13 20:35:11 verwilst Exp $ IUSE="ssl" -ICQv7="0.2.9.5" +ICQv7="0.3.0pre2" S="${WORKDIR}/jabber-${PV}" DESCRIPTION="Open Source Jabber Server & MUC,AIM,MSN,ICQ and Yahoo transports" @@ -17,8 +17,10 @@ SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz http://files.jabberstudio.org/mu-conference/muconference-0.3.tar.gz mirror://sourceforge/icqv7-t/icqv7-t-${ICQv7}.tar.gz" -DEPEND=">=dev-libs/pth-1.4.0 +DEPEND="=dev-libs/pth-1.4.0 >=dev-libs/glib-2 + ~dev-libs/libsigc++-1.0.4 + >=net-libs/libicq2000-0.3.1 ssl? ( >=dev-libs/openssl-0.9.6g )" SLOT="0" @@ -35,6 +37,7 @@ src_unpack() { unpack yahoo-t-2.1.1.tar.gz unpack muconference-0.3.tar.gz unpack icqv7-t-${ICQv7}.tar.gz + patch -p0 < ${FILESDIR}/hash_map_gcc32.patch mv ${S}/aim-transport-stable-20021012 ${S}/aim-transport cd ${S}/aim-transport cp ${DISTDIR}/Install_AIM_3.5.1670.exe . @@ -71,9 +74,8 @@ src_compile() { if [ "${COMPILER}" = "gcc3" ]; then cd ${S}/icqv7-t-${ICQv7} - ./configure || die - make || die - make install + ./configure --bindir=${D}/usr --sbindir=${D}/usr --with-jabberd=../jabberd || die + make CFLAGS="${CFLAGS} -I../../jabberd " || die fi } @@ -84,10 +86,16 @@ src_install() { cd ${S} exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r1 jabber mkdir -p ${D}/usr/sbin + mkdir -p ${D}/etc/jabber mkdir -p ${D}/usr/lib/jabber mkdir -p ${D}/var/log/jabber mkdir -p ${D}/var/run + if [ "${COMPILER}" = "gcc3" ]; then + cd ${S}/icqv7-t-${ICQv7} + make DESTDIR=${D} install || die + fi + cp ${S}/jabberd/jabberd ${D}/usr/sbin/ cp ${S}/aim-transport/src/aimtrans.so ${D}/usr/lib/jabber/ cp ${S}/aim-transport/Install_AIM_3.5.1670.exe ${D}/usr/lib/jabber/ |