diff options
Diffstat (limited to 'net-voip/twinkle')
| -rw-r--r-- | net-voip/twinkle/ChangeLog | 5 | ||||
| -rw-r--r-- | net-voip/twinkle/twinkle-1.4.1.ebuild | 64 | ||||
| -rw-r--r-- | net-voip/twinkle/twinkle-1.4.2.ebuild | 32 |
3 files changed, 16 insertions, 85 deletions
diff --git a/net-voip/twinkle/ChangeLog b/net-voip/twinkle/ChangeLog index 7a4078ad1d80..5d6864ba2562 100644 --- a/net-voip/twinkle/ChangeLog +++ b/net-voip/twinkle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-voip/twinkle # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/ChangeLog,v 1.3 2009/10/24 12:32:30 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/ChangeLog,v 1.4 2009/12/28 10:58:16 ssuominen Exp $ + + 28 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> twinkle-1.4.2.ebuild: + Stop using deprecated kde.eclass. 24 Oct 2009; nixnut <nixnut@gentoo.org> twinkle-1.4.2.ebuild: ppc stable #285683 diff --git a/net-voip/twinkle/twinkle-1.4.1.ebuild b/net-voip/twinkle/twinkle-1.4.1.ebuild deleted file mode 100644 index 23a63f1e0f57..000000000000 --- a/net-voip/twinkle/twinkle-1.4.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.1.ebuild,v 1.1 2009/10/06 02:47:02 dragonheart Exp $ - -EAPI=2 -ARTS_REQUIRED="never" -inherit eutils qt3 kde autotools - -DESCRIPTION="a soft phone for your VOIP communcations using SIP" -HOMEPAGE="http://www.twinklephone.com/" -SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="kde arts speex ilbc zrtp kdehiddenvisibility" - -# Requires libqt-mt actually... Is that *always* built, or do we need to check? -RDEPEND=">=net-libs/ccrtp-1.6.0 - >=dev-cpp/commoncpp2-1.6.1 - x11-libs/qt:3 - media-libs/libsndfile - dev-libs/boost - speex? ( media-libs/speex ) - ilbc? ( dev-libs/ilbc-rfc3951 ) - zrtp? ( >=net-libs/libzrtpcpp-1.3.0 ) - media-libs/alsa-lib" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - if use speex && has_version '~media-libs/speex-1.2_beta2' && - ! built_with_use 'media-libs/speex' 'wideband' ; then - eerror "You need to build media-libs/speex with USE=wideband enabled." - die "Speex w/o wideband-support detected." - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-kdedetect.patch - eautoreconf -} - -src_configure() { - local myconf=" \ - $(use_with kde) \ - $(use_with ilbc) \ - $(use_with arts) \ - $(use_with zrtp) \ - $(use_with speex)" - set-kdedir - kde_src_configure myconf configure -} - -src_compile() { - kde_src_compile make -} - -src_install() { - kde_src_install - domenu twinkle.desktop - dodoc THANKS -} diff --git a/net-voip/twinkle/twinkle-1.4.2.ebuild b/net-voip/twinkle/twinkle-1.4.2.ebuild index b4960295e94f..9ca9b1831ba3 100644 --- a/net-voip/twinkle/twinkle-1.4.2.ebuild +++ b/net-voip/twinkle/twinkle-1.4.2.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.2.ebuild,v 1.3 2009/10/24 12:32:30 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/twinkle/twinkle-1.4.2.ebuild,v 1.4 2009/12/28 10:58:16 ssuominen Exp $ EAPI=2 -ARTS_REQUIRED="never" -inherit eutils qt3 kde autotools +inherit autotools eutils qt3 DESCRIPTION="a soft phone for your VOIP communcations using SIP" HOMEPAGE="http://www.twinklephone.com/" @@ -13,10 +12,8 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="kde arts speex ilbc zrtp" +IUSE="speex ilbc zrtp" -# Requires libqt-mt actually... Is that *always* built, or do we need to check? -# Now speex so we don't need built_with_use checks for wideband any more RDEPEND=">=net-libs/ccrtp-1.6.0 >=dev-cpp/commoncpp2-1.6.1 x11-libs/qt:3 @@ -26,7 +23,6 @@ RDEPEND=">=net-libs/ccrtp-1.6.0 ilbc? ( dev-libs/ilbc-rfc3951 ) zrtp? ( >=net-libs/libzrtpcpp-1.3.0 ) media-libs/alsa-lib" - DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -36,21 +32,17 @@ src_prepare() { } src_configure() { - local myconf=" \ - $(use_with kde) \ - $(use_with ilbc) \ - $(use_with arts) \ - $(use_with zrtp) \ - $(use_with speex)" - kde_src_configure myconf configure -} - -src_compile() { - kde_src_compile make + econf \ + --disable-dependency-tracking \ + --without-kde \ + $(use_with ilbc) \ + $(use_with speex) \ + $(use_with zrtp) \ + --without-arts } src_install() { - kde_src_install + emake DESTDIR="${D}" install || die domenu twinkle.desktop - dodoc THANKS + dodoc AUTHORS ChangeLog NEWS README THANKS } |