diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-11 19:41:50 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-11 19:41:50 +0000 |
| commit | 9ac533d3a85ff7ff7d40e65b71c0fc4fb71a8d5b (patch) | |
| tree | 66b994fee164269656250266c2c52fe1cc2d3eb0 | |
| parent | Masked dev-php/pecl-{idn,enchant} (diff) | |
| download | gentoo-2-9ac533d3a85ff7ff7d40e65b71c0fc4fb71a8d5b.tar.gz gentoo-2-9ac533d3a85ff7ff7d40e65b71c0fc4fb71a8d5b.tar.bz2 gentoo-2-9ac533d3a85ff7ff7d40e65b71c0fc4fb71a8d5b.zip | |
Update ebuild. Patch by Arfrever.
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
| -rw-r--r-- | net-irc/kvirc/ChangeLog | 5 | ||||
| -rw-r--r-- | net-irc/kvirc/kvirc-9999.ebuild | 21 |
2 files changed, 11 insertions, 15 deletions
diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog index 12e15707a18f..9d0c2565e381 100644 --- a/net-irc/kvirc/ChangeLog +++ b/net-irc/kvirc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-irc/kvirc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.139 2012/02/04 09:57:10 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.140 2012/02/11 19:41:50 floppym Exp $ + + 11 Feb 2012; Mike Gilbert <floppym@gentoo.org> kvirc-9999.ebuild: + Update ebuild. Patch by Arfrever. 04 Feb 2012; Markos Chandras <hwoarang@gentoo.org> kvirc-4.2_pre5816.ebuild: Convert to EAPI4 so we can use REQUIRED_USE to force certain useflag diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 43eb4c21b825..70061376f3b2 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.30 2011/03/26 17:27:43 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.31 2012/02/11 19:41:50 floppym Exp $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="python? 2" inherit cmake-utils multilib python subversion @@ -18,8 +18,7 @@ SLOT="4" KEYWORDS="" IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus qt-webkit +ssl theora +transparency" -RDEPEND=">=dev-libs/crypto++-5.6.0-r1 - sys-libs/zlib +RDEPEND="sys-libs/zlib x11-libs/libX11 >=x11-libs/qt-core-4.6 >=x11-libs/qt-gui-4.6 @@ -43,18 +42,11 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" RDEPEND="${RDEPEND} gsm? ( media-sound/gsm )" +REQUIRED_USE="audiofile? ( oss ) theora? ( dcc_video )" DOCS="ChangeLog doc/FAQ" pkg_setup() { - if use audiofile && ! use oss; then - die "USE=\"audiofile\" requires USE=\"oss\"" - fi - - if use theora && ! use dcc_video; then - die "USE=\"theora\" requires USE=\"dcc_video\"" - fi - if use python; then python_set_active_version 2 python_pkg_setup @@ -69,13 +61,14 @@ src_prepare() { } src_configure() { + append-flags -fno-strict-aliasing + local libdir="$(get_libdir)" local mycmakeargs=( -DLIB_SUFFIX=${libdir#lib} -DMANUAL_REVISION=${VERSIO_PRAESENS} -DWANT_COEXISTENCE=1 -DWANT_CRYPT=1 - -DWANT_CRYPTOPP=1 -DWANT_ENV_FLAGS=1 -DWANT_VERBOSE=1 $(cmake-utils_use_want audiofile AUDIOFILE) |