From 4ccad49e5784e4f474de7e8a46f3b6b254f5a269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Mon, 8 Feb 2016 15:14:45 +0100 Subject: [PATCH] [net-im/spectrum] remove pointless libev useflag, remove skype, cleanup pkg_setup --- net-im/spectrum/spectrum-9999.ebuild | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/net-im/spectrum/spectrum-9999.ebuild b/net-im/spectrum/spectrum-9999.ebuild index 42731ee..e2e0e62 100644 --- a/net-im/spectrum/spectrum-9999.ebuild +++ b/net-im/spectrum/spectrum-9999.ebuild @@ -26,8 +26,8 @@ HOMEPAGE="http://spectrum.im" LICENSE="GPL-2" SLOT="2" -IUSE_PLUGINS="frotz irc jabber purple skype sms twitter" -IUSE="debug doc libev mysql postgres sqlite test ${IUSE_PLUGINS}" +IUSE_PLUGINS="frotz irc jabber purple sms twitter" +IUSE="debug doc mysql postgres sqlite test ${IUSE_PLUGINS}" RDEPEND="${RDEPEND} =net-im/swift-9999[ssl] @@ -42,8 +42,6 @@ RDEPEND="${RDEPEND} sqlite? ( dev-db/sqlite:3 ) irc? ( net-im/communi ) purple? ( >=net-im/pidgin-2.6.0 ) - skype? ( dev-libs/dbus-glib x11-base/xorg-server[xvfb] net-im/skype ) - libev? ( dev-libs/libev ) " DEPEND="${RDEPEND} @@ -55,14 +53,10 @@ DEPEND="${RDEPEND} REQUIRED_USE="|| ( sqlite mysql postgres )" -pkg_setup() { - CMAKE_IN_SOURCE_BUILD=1 - use debug && CMAKE_BUILD_TYPE=Debug - MYCMAKEARGS="-DLIB_INSTALL_DIR=$(get_libdir)" -} +CMAKE_IN_SOURCE_BUILD=1 src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_enable mysql MYSQL) $(cmake-utils_use_enable postgres PQXX) $(cmake-utils_use_enable sqlite SQLITE3) @@ -71,9 +65,9 @@ src_configure() { $(cmake-utils_use_enable irc IRC) $(cmake-utils_use_enable jabber SWIFTEN) $(cmake-utils_use_enable purple PURPLE) - $(cmake-utils_use_enable skype SKYPE) $(cmake-utils_use_enable sms SMSTOOLS3) $(cmake-utils_use_enable twitter TWITTER) + -DLIB_INSTALL_DIR=$(get_libdir) ) cmake-utils_src_configure