diff options
| -rw-r--r-- | net-irc/kvirc/ChangeLog | 9 | ||||
| -rw-r--r-- | net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild | 63 | ||||
| -rw-r--r-- | net-irc/kvirc/kvirc-3.4.2.ebuild (renamed from net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild) | 34 |
3 files changed, 28 insertions, 78 deletions
diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog index 2b073326338d..fb83a42e5950 100644 --- a/net-irc/kvirc/ChangeLog +++ b/net-irc/kvirc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/kvirc # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.73 2008/11/02 14:22:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.74 2008/11/02 16:01:00 scarabeus Exp $ + +*kvirc-3.4.2 (02 Nov 2008) + + 02 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> + -kvirc-3.2.6_pre20070714.ebuild, -kvirc-3.2.6_pre20080204.ebuild, + +kvirc-3.4.2.ebuild: + Version bump. Remove old. 02 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> kvirc-9999.ebuild: Update live ebuild so it keeps track with upstram changes. diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild deleted file mode 100644 index 03383e38f928..000000000000 --- a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild,v 1.7 2008/01/19 13:59:12 ingmar Exp $ - -inherit autotools eutils kde-functions - -DESCRIPTION="An advanced IRC Client" -HOMEPAGE="http://www.kvirc.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="kvirc" -SLOT="3" -KEYWORDS="amd64 ~mips ppc sparc x86" -IUSE="debug esd ipv6 kde oss ssl" - -RDEPEND="esd? ( media-sound/esound ) - ssl? ( dev-libs/openssl ) - oss? ( media-libs/audiofile ) - kde? ( =kde-base/kdelibs-3.5* ) - =x11-libs/qt-3*" - -DEPEND="${RDEPEND} - sys-devel/gettext" - -S=${WORKDIR}/${PN} - -src_unpack() { - unpack ${A} - cd "${S}" - ./autogen.sh - epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch - epatch "${FILESDIR}"/${PN}-noipv6.patch - epatch "${FILESDIR}"/${PN}-gendoc.patch -} - -src_compile() { - set-qtdir 3 - set-kdedir 3 - - # use aa even when kde support is disabled; remove the splash screen - # to speed up the startup. - local myconf="--with-aa-fonts --without-splash-screen - --with-big-channels --with-pizza" - - # For myconf, we can't do it the easy way (use_with) because the configure - # script will assume we're telling it not to include support. - myconf="${myconf} `use_with debug debug-symbols`" - use kde || myconf="${myconf} --without-kde-support --without-arts-support" - use ipv6 || myconf="${myconf} --without-ipv6-support" - use esd || myconf="${myconf} --without-esd-support" - use ssl || myconf="${myconf} --without-ssl-support" - - [[ "${ARCH}" == "x86" ]] && myconf="${myconf} --with-ix86-asm" - - econf ${myconf} || die "econf failed" - emake -j1 || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - emake DESTDIR="${D}" docs || die "emake docs failed" - dodoc ChangeLog INSTALL README TODO -} diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild b/net-irc/kvirc/kvirc-3.4.2.ebuild index 00abb392998b..3f9519e03789 100644 --- a/net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild +++ b/net-irc/kvirc/kvirc-3.4.2.ebuild @@ -1,41 +1,42 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.6_pre20080204.ebuild,v 1.3 2008/02/06 21:15:19 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.4.2.ebuild,v 1.1 2008/11/02 16:01:00 scarabeus Exp $ -inherit autotools eutils kde-functions +EAPI="1" + +inherit eutils kde-functions DESCRIPTION="An advanced IRC Client" HOMEPAGE="http://www.kvirc.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +SRC_URI="ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2" LICENSE="kvirc" SLOT="3" KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" -IUSE="debug esd ipv6 kde oss ssl" +IUSE="debug esd ipv6 kde oss qt4 ssl" RDEPEND="esd? ( media-sound/esound ) ssl? ( dev-libs/openssl ) oss? ( media-libs/audiofile ) - kde? ( =kde-base/kdelibs-3.5* ) - =x11-libs/qt-3*" + kde? ( kde-base/kdelibs:3.5 ) + qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) ) + !qt4? ( x11-libs/qt:3 )" DEPEND="${RDEPEND} sys-devel/gettext" -S="${WORKDIR}/${PN}" - src_unpack() { unpack ${A} cd "${S}" - #eautoreconf - ./autogen.sh - epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch + epatch "${FILESDIR}"/${PN}-3.4.0-kdedir-fix.patch epatch "${FILESDIR}"/${PN}-gendoc.patch } src_compile() { - set-qtdir 3 - set-kdedir 3 + if ! use qt4 ; then + set-qtdir 3 + set-kdedir 3 + fi # use aa even when kde support is disabled; remove the splash screen # to speed up the startup. @@ -45,7 +46,12 @@ src_compile() { # For myconf, we can't do it the easy way (use_with) because the configure # script will assume we're telling it not to include support. myconf="${myconf} `use_with debug debug-symbols`" - use kde || myconf="${myconf} --without-kde-support --without-arts-support" + if use qt4 ; then + myconf="${myconf} --enable-qt4 --with-qt4-moc=/usr/bin/moc" + myconf="${myconf} --without-kde-support --without-arts-support" + else + use kde || myconf="${myconf} --without-kde-support --without-arts-support" + fi use ipv6 || myconf="${myconf} --without-ipv6-support" use esd || myconf="${myconf} --without-esd-support" use ssl || myconf="${myconf} --without-ssl-support" |