summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/wvstreams')
-rw-r--r--net-libs/wvstreams/ChangeLog11
-rw-r--r--net-libs/wvstreams/Manifest16
-rw-r--r--net-libs/wvstreams/files/digest-wvstreams-4.0.11
-rw-r--r--net-libs/wvstreams/files/digest-wvstreams-4.0.1-r11
-rw-r--r--net-libs/wvstreams/files/digest-wvstreams-4.0.21
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch12
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch193
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch24
-rw-r--r--net-libs/wvstreams/wvstreams-4.0.1.ebuild74
-rw-r--r--net-libs/wvstreams/wvstreams-4.0.2.ebuild (renamed from net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild)19
10 files changed, 261 insertions, 91 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 87d852c8e1cf..36866d1537b6 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-libs/wvstreams
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.46 2005/03/24 01:50:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.47 2005/03/29 09:20:10 mrness Exp $
+
+*wvstreams-4.0.2 (29 Mar 2005)
+
+ 29 Mar 2005; Alin Nastac <mrness@gentoo.org>
+ +files/wvstreams-4.0.2-MOC-fix.patch,
+ +files/wvstreams-4.0.2-linux-serial.patch,
+ +files/wvstreams-4.0.2-tcl_8_4.patch, -wvstreams-4.0.1-r1.ebuild,
+ -wvstreams-4.0.1.ebuild, +wvstreams-4.0.2.ebuild:
+ Version bump. Remove old test versions.
23 Mar 2005; Jason Wever <weeve@gentoo.org> wvstreams-4.0.1-r2.ebuild:
Stable on SPARC wrt bug #84817.
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 138f66f8a7fe..409b52e5560f 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,15 +1,13 @@
-MD5 5e1afc451cc4e0e7dae7cfae9c52d307 ChangeLog 7171
-MD5 3dd88dcf536208ca7e46e823c82550be wvstreams-4.0.1.ebuild 1899
-MD5 ef0eabdb3c3c15706bee21630a0cdacb wvstreams-4.0.1-r1.ebuild 1975
MD5 cfe93e4d7a16d678b6ea85b453d1c833 wvstreams-4.0.1-r2.ebuild 2162
-MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
+MD5 c3cd7d05033cfa3855d6802aeff97db8 wvstreams-4.0.2.ebuild 2128
MD5 88beb02e20267e4fc08543358e899909 wvstreams-4.0-r1.ebuild 1872
-MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1 68
-MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
-MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r1 68
+MD5 5e1afc451cc4e0e7dae7cfae9c52d307 ChangeLog 7171
+MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
-MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
MD5 f606f86f5ef7d07937128fc8dc043c83 files/wvstreams-4.0-tcl_8_4.patch 822
MD5 7c5ceff9d19db13318a9c8c6de08e7ef files/digest-wvstreams-4.0-r1 66
+MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
+MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
+MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.1 b/net-libs/wvstreams/files/digest-wvstreams-4.0.1
deleted file mode 100644
index 967ae2bc824d..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89cdc4f979d1f6d745e173bc7485f325 wvstreams-4.0.1.tar.gz 1058667
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1
deleted file mode 100644
index 967ae2bc824d..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89cdc4f979d1f6d745e173bc7485f325 wvstreams-4.0.1.tar.gz 1058667
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.2
new file mode 100644
index 000000000000..011b5158f39b
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.0.2
@@ -0,0 +1 @@
+MD5 ecb4e74ebaa1f45206f5d88eb34c5623 wvstreams-4.0.2.tar.gz 1098599
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch
new file mode 100644
index 000000000000..f72d4a43b7ee
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch
@@ -0,0 +1,12 @@
+diff -ur wvstreams-4.0.1.orig/wvrules.mk wvstreams-4.0.1/wvrules.mk
+--- wvstreams-4.0.1.orig/wvrules.mk 2005-03-05 17:11:10.000000000 +0100
++++ wvstreams-4.0.1/wvrules.mk 2005-03-05 17:11:57.000000000 +0100
+@@ -284,7 +284,7 @@
+ %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E)
+ %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E)
+
+-%.moc: %.h; moc -o $@ $<
++%.moc: %.h; $(MOC) -o $@ $<
+
+ ../%.so:; @echo "Shared library $@ does not exist!"; exit 1
+ ../%.a:; @echo "Library $@ does not exist!"; exit 1
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch
new file mode 100644
index 000000000000..153d9ff04e2e
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch
@@ -0,0 +1,193 @@
+diff -Nru wvstreams-4.0.2.orig/config.guess wvstreams-4.0.2/config.guess
+--- wvstreams-4.0.2.orig/config.guess 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/config.guess 2005-03-29 12:02:45.364438808 +0300
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+-timestamp='2004-08-13'
++timestamp='2004-11-12'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -319,6 +319,9 @@
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
++ *:z/VM:*:*)
++ echo s390-ibm-zvmoe
++ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
+@@ -342,7 +345,7 @@
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+- DRS?6000:UNIX_SV:4.2*:7*)
++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
+@@ -824,6 +827,12 @@
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
++ crisv32:Linux:*:*)
++ echo crisv32-axis-linux-gnu
++ exit 0 ;;
++ frv:Linux:*:*)
++ echo frv-unknown-linux-gnu
++ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+@@ -1241,7 +1250,10 @@
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+- esac
++ esac ;;
++ *:XENIX:*:SysV)
++ echo i386-pc-xenix
++ exit 0 ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+diff -Nru wvstreams-4.0.2.orig/config.sub wvstreams-4.0.2/config.sub
+--- wvstreams-4.0.2.orig/config.sub 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/config.sub 2005-03-29 12:02:45.365438656 +0300
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+-timestamp='2004-06-24'
++timestamp='2004-11-30'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -267,7 +267,7 @@
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+- | x86 | xscale | xstormy16 | xtensa \
++ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+@@ -343,8 +343,8 @@
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+- | xtensa-* \
++ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | xstormy16-* | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+@@ -457,6 +457,9 @@
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
++ crisv32 | crisv32-* | etraxfs*)
++ basic_machine=crisv32-axis
++ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+@@ -486,6 +489,10 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ djgpp)
++ basic_machine=i586-pc
++ os=-msdosdjgpp
++ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+@@ -1026,6 +1033,10 @@
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
++ xbox)
++ basic_machine=i686-pc
++ os=-mingw32
++ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+@@ -1294,6 +1305,9 @@
+ -kaos*)
+ os=-kaos
+ ;;
++ -zvmoe)
++ os=-zvmoe
++ ;;
+ -none)
+ ;;
+ *)
+diff -Nru wvstreams-4.0.2.orig/debian/control wvstreams-4.0.2/debian/control
+--- wvstreams-4.0.2.orig/debian/control 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/debian/control 2005-03-29 12:02:45.367438352 +0300
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Simon Law <sfllaw@debian.org>
+ Uploaders: James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
+-Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev
++Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev, doxygen
+ Build-Depends-Indep: doxygen
+ Standards-Version: 3.6.1
+
+@@ -99,7 +99,7 @@
+ Package: libwvstreams-dev
+ Architecture: any
+ Section: libdevel
+-Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, ${misc:Depends}
++Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, libxplc0.3.10-dev, ${misc:Depends}
+ Provides: libwvstreams4.0-dev
+ Description: Development libraries and header files for libwvstreams4.0
+ Contains the header files and static libraries for use in rapid
+diff -Nru wvstreams-4.0.2.orig/streams/wvmodem.cc wvstreams-4.0.2/streams/wvmodem.cc
+--- wvstreams-4.0.2.orig/streams/wvmodem.cc 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/streams/wvmodem.cc 2005-03-29 12:09:25.258645648 +0300
+@@ -192,22 +192,22 @@
+ drain();
+
+ #if HAVE_LINUX_SERIAL_H
+- struct serial_struct old_sinfo, sinfo;
+- sinfo.reserved_char[0] = 0;
+- if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
+- seterr("Cannot get information for serial port.");
+- else
+- {
+- sinfo = old_sinfo;
+- // Why there are two closing wait timeouts, is beyond me
+- // but there are... apparently the second one is deprecated
+- // but why take a chance...
+- sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
+- sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
+-
+- if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
+- seterr("Cannot set information for serial port.");
+- }
++ if (getuid() == 0)
++ {
++ struct serial_struct sinfo;
++ if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
++ {
++ // Why there are two closing wait timeouts, is beyond me
++ // but there are... apparently the second one is deprecated
++ // but why take a chance...
++ sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
++ sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
++
++ //Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...)
++ //see http://bugs.gentoo.org/show_bug.cgi?id=85754
++ ioctl(getrfd(), TIOCSSERIAL, &sinfo);
++ }
++ }
+ #endif
+
+ // set up the terminal characteristics.
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch
new file mode 100644
index 000000000000..da5fd71b5a34
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch
@@ -0,0 +1,24 @@
+diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac
+--- wvstreams-4.0.2.orig/configure.ac 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/configure.ac 2005-03-29 12:11:53.268144784 +0300
+@@ -474,9 +474,9 @@
+ # tcl
+ if test "$with_tcl" != "no"; then
+ CPPFLAGS_save="$CPPFLAGS"
+- WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
++ WV_APPEND(CPPFLAGS, -I/usr/include)
+ AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
+- AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
++ AC_CHECK_LIB(tcl8.4, TclInterpInit,, [with_tcl=no])
+ if test "$with_tcl" != "no"; then
+ CPPFLAGS="$CPPFLAGS_save"
+ fi
+diff -Nru wvstreams-4.0.2.orig/vars.mk wvstreams-4.0.2/vars.mk
+--- wvstreams-4.0.2.orig/vars.mk 2005-03-24 04:01:23.000000000 +0200
++++ wvstreams-4.0.2/vars.mk 2005-03-29 12:11:53.267144936 +0300
+@@ -251,3 +251,5 @@
+
+ libwvgtk.a libwvgtk.so: $(call objects,gtk)
+ libwvgtk.so: -lgtk -lgdk libwvstreams.so libwvutils.so
++
++libuniconf_tcl.so: bindings/uniconf_tcl.o -ltcl8.4 -luniconf
diff --git a/net-libs/wvstreams/wvstreams-4.0.1.ebuild b/net-libs/wvstreams/wvstreams-4.0.1.ebuild
deleted file mode 100644
index c57417680c9f..000000000000
--- a/net-libs/wvstreams/wvstreams-4.0.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1.ebuild,v 1.5 2005/02/17 19:59:44 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
-SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
-IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
-
-RDEPEND="virtual/libc
- dev-libs/xplc
- gtk? ( >=x11-libs/gtk+-2.2.0 )
- qt? ( >=x11-libs/qt-3.0.5 )
- oggvorbis? ( >=media-libs/libogg-1.0
- >=media-libs/libvorbis-1.0 )
- speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
- fam? ( virtual/fam )
- >=sys-libs/db-3
- qdbm? ( dev-db/qdbm )
- pam? ( >=sys-libs/pam-0.75 )
- slp? ( >=net-libs/openslp-1.0.9a )
- >=sys-libs/zlib-1.1.4
- dev-libs/openssl
- doc? ( app-doc/doxygen )
- fftw? ( sci-libs/fftw )
- tcltk? ( >=dev-lang/tcl-8.4* dev-lang/swig )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=sys-devel/autoconf-2.59"
-
-src_unpack() {
- unpack ${A} ; cd ${S}
-
- if useq tcltk; then
- epatch ${FILESDIR}/${P}-tcl_8_4.patch
- env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
- fi
-}
-
-src_compile() {
- econf `use_with gtk` \
- `use_with qt` \
- `use_with oggvorbis ogg` \
- `use_with oggvorbis vorbis` \
- `use_with speex` \
- `use_with fam` \
- `use_with qdbm` \
- `use_with pam` \
- `use_with fftw` \
- `use_with slp openslp` \
- `use_with tcltk tcl` \
- `use_enable debug` \
- --enable-verbose \
- --with-bdb \
- --with-openssl \
- --with-zlib \
- --with-xplc \
- || die "configure failed"
- emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
- use doc && doxygen
-}
-
-src_install() {
- make DESTDIR=${D} install || die "make install failed"
- dodoc README COPYING.LIB
- use doc && dohtml -r Docs/doxy-html/*
-}
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
index d9583d9793be..c3dc7616820b 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r1.ebuild,v 1.1 2005/02/17 19:59:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.1 2005/03/29 09:20:10 mrness Exp $
inherit eutils
@@ -16,7 +16,7 @@ IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
RDEPEND="virtual/libc
dev-libs/xplc
gtk? ( >=x11-libs/gtk+-2.2.0 )
- qt? ( >=x11-libs/qt-3.0.5 )
+ qt? ( =x11-libs/qt-3* )
oggvorbis? ( >=media-libs/libogg-1.0
>=media-libs/libvorbis-1.0 )
speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
@@ -38,17 +38,26 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A} ; cd ${S}
- epatch ${FILESDIR}/${P}-linux-serial.patch || die "failed to patch"
+ epatch ${FILESDIR}/${P}-linux-serial.patch
if useq tcltk; then
epatch ${FILESDIR}/${P}-tcl_8_4.patch
env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
fi
+
+ useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
}
src_compile() {
- econf `use_with gtk` \
- `use_with qt` \
+ local myconf
+ if useq qt; then
+ myconf="--with-qt=/usr/qt/3/"
+ export MOC="/usr/qt/3/bin/moc"
+ else
+ myconf="--without-qt"
+ fi
+ econf ${myconf} \
+ `use_with gtk` \
`use_with oggvorbis ogg` \
`use_with oggvorbis vorbis` \
`use_with speex` \